Merge tag '0.10.2' into develop

v0.10.2
More bugfixes for merge
Added unittests for merge
Added some more tests
Bugfix. Need to be classmethod
Cleanup
Added extra test
Bumped version
Merge branch 'release/0.10.3'