Docstrings are fun!
bump version number.
Merge branch 'release/1.2' into develop