Merge branch 'release/0.6.0' into develop
various bugfixes
bumped version
Merge branch 'release/0.6.1'