Minor edits to docstring
Merge remote-tracking branch 'origin/develop' into develop