Merge branch 'gh-pages'
Small style changes
Updated content
Merge branch 'master' into gh-pages