Added some C++ and doxygen stuff