Updated with Doxygen included