Refactor docstring
Merge branch 'develop'