Merge style from gh-page
Merge branch 'master' into gh-pages