version 0.1.2
fixes #3
Merge branch 'master' into gh-pages