Merge branch 'master' into develop
Fix docstring markup to generate docs properly
Merge branch 'develop'