Fixed build system
merged and added doxygen support