Merge tag '0.10' into develop

v0.10
Docstring cleanup
Added missing import
Bugfix for argument parsing in merge operator
Bumped version
Merge branch 'release/0.10.1'