fix misplaced docstrings
Merge branch 'pr/50'
Update changelog