documentation fixes
Merge branch 'develop' into feature/issue-8-documentation-fixes
Merge branch 'feature/issue-8-documentation-fixes' into develop