v 0.1.0
Merge branch 'master' into gh-pages