diff --git a/src/ucore_utils.h b/src/ucore_utils.h
index d378e53..0c72564 100644
--- a/src/ucore_utils.h
+++ b/src/ucore_utils.h
@@ -49,6 +49,7 @@
 const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
     (type *)( (char *)__mptr - offsetof(type, member) ); })
 
+#define UC_ALIGN(val,align) (((val)+(align)-1UL)&~((align)-1UL))
 
 #endif
 
diff --git a/src/ucore_version.h b/src/ucore_version.h
index 86f6d9d..d4369e7 100644
--- a/src/ucore_version.h
+++ b/src/ucore_version.h
@@ -1,10 +1,46 @@
 #ifndef UCORE_VERSION_H_
 #define UCORE_VERSION_H_
+/**
+ * @mainpage
+ *  @htmlonly
+ *  <pre>
+ *  Copyright (c) 2002-2012 Nils O. Selåsdal <NOS@Utel.no>.
+ *  All rights reserved, all wrongs reversed.
+ *  
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  </pre>
+ *  @endhtmlonly
+ */
 
+/* Major version of the ucore library*/
 extern const int ucore_version_major;
+/* Minor version of the ucore library*/
 extern const int ucore_version_minor;
+/* Patch version of the ucore library*/
 extern const int ucore_version_patch;
 
+/** The version number as a string.
+ * Might contain non-numeric suffix indicating
+ * e.g. development version or similar*/
 extern const char ucore_version_str[];
 
 #endif