Bump version.
Update docstring.
Fix typo, some clean-up
More docstring.
Merge branch 'release-18' into develop