Doxygen changes
Merge branch 'develop' into release0.4
Merge branch 'release0.4'