Merge tag '0.1.2'

0.1.2
Merge branch 'master' into HEAD