Release 0.1.2
Merge branch 'master' into develop