Merge branch 'develop'
Update `doxyfile`
Merge branch 'master' into develop