Modifications for Doxygen
Merge branch 'Doxygen'