Merge branch 'gh-pages'
Update README
Merge branch 'master' into gh-pages