Merge branch 'gh-pages'
adding information to index
Merge branch 'master' into gh-pages