Merge branch 'develop'
Fixed documentation
Merge branch 'develop'
Fixed typo
removed untrue doc comment