Merge branch 'release/0.1.2' into develop
bugfixes
bumped version
Merge branch 'release/0.1.3'