Merge branch 'master' into gh-pages
Style changes
Correct description color code
Merge branch 'gh-pages'