Minor changes
Merge branch 'master' into gh-pages
Merge gh-pages with master