Bugfix for merge
Docstring fixes
Bumped version
Merge branch 'release/0.10.2'
Merge tag '0.10.2' into develop

v0.10.2