Merge branch 'release/0.1.0-4' into develop
Merge branch 'master' into develop
release 0.1.2
Merge branch 'release/0.1.2'