Merge branch 'gh-pages'
adding some comments to explain
Merge branch 'master' into gh-pages