diff --git a/.gitignore b/.gitignore
index 73a2be8..9e1eaff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,8 @@ todo
 vsc*
 libcompound.so
 ccwarn
+<<<<<<< HEAD
+=======
+CMakeLists_default.txt
+>>>>>>> 010300157e252e47218c74f256bca0ea12b7baa3
 genwarn.sh
diff --git a/CompoundTest b/CompoundTest
new file mode 100755
index 0000000..d72d4c5
Binary files /dev/null and b/CompoundTest differ
diff --git a/function.h b/function.h
index f5b288d..52f5ea6 100644
--- a/function.h
+++ b/function.h
@@ -7,11 +7,8 @@ typedef Var Type;
 
 typedef struct {
   attr(registered 1)  Type type;
-  
-  attr(nullity false)  String identity;
-  
-  attr(alignwith 1)
-  attr(optional true)  Type value;
+  attr(nullity false)  String identity;  
+  attr(alignwith 1; optional true)  Type value;
 } Parameter;
 
 typedef void * Block;
diff --git a/install b/install
index bcb1eb4..05df022 100755
--- a/install
+++ b/install
@@ -35,7 +35,7 @@ done
 
 cp -v "common.h" "const.h" "platform.h"\
       "name.h" "namescope.h" "type.h" "catlog.h"\
-      "attr.h" "registry.h" "class.h" "$DST"
+      "attr.h" "registry.h" "class.h" "function.h" "$DST"
 
 echo "Installing libcompound:"
 cp -v "libcompound.so" "/usr/lib"