Merge branch 'gh-pages'
corrected story
Merge branch 'master' into gh-pages