Merge branch 'gh-pages'
Update read me
Merge branch 'master' into gh-pages