Index: libcfa/src/parseconfig.cfa
===================================================================
--- libcfa/src/parseconfig.cfa	(revision 98d6b744bef304bc4b77fbfde055bd73de79965f)
+++ libcfa/src/parseconfig.cfa	(revision 02a22a264ae377bd69f044b224629396bed8a4e1)
@@ -45,5 +45,5 @@
 }
 
-void add_kv_pair( KVPairs kv_pairs, char * k, char * v ) with ( kv_pairs ) {
+void add_kv_pair( KVPairs & kv_pairs, char * k, char * v ) with ( kv_pairs ) {
 	if ( size == max_size ) {
 		max_size *= 2;
@@ -67,5 +67,6 @@
 // Parse configuration from a file formatted in shell style
 KVPairs & parse_shell_config_format( const char * config_file, size_t num_entries ) {
-	* KVPairs kv_pairs;// = { num_entries };
+	// * KVPairs kv_pairs;
+	KVPairs kv_pairs = { num_entries };
 
 	ifstream in;
@@ -80,5 +81,5 @@
 			in | value;
 
-			add_kv_pair( *kv_pairs, key, value );
+			add_kv_pair( kv_pairs, key, value );
 
 		  if ( fail( in ) ) break;
@@ -91,5 +92,5 @@
 	close( in );
 
-	return *kv_pairs;
+	return kv_pairs;
 }