Merge branch 'gh-pages'
Added comments
Merge branch 'master' into gh-pages