Merge branch 'gh-pages'
Updated Readme
Merge branch 'master' into gh-pages