Merge branch 'release-0.1.2'
cleanup commit
Merge branch 'master' into release-0.1.2