Update README
Merge branch 'master' into gh-pages (v0.1.2)