Doxygen + documentation
Merge