Cleanup and doxygen cosmetics
Merge branch 'origin/master'
small update to commit