fixed typo in docstring
Merge branch 'develop'