Bugfix
Merge branch 'release/release-0.1' into develop