Merge branch 'master' into gh-pages
More customizations
Merge branch 'gh-pages'