Merge branch 'gh-pages'
Version 0.2.1
Merge branch 'master' into gh-pages