Merge branch 'master' into gh-pages
more edits
Merge branch 'gh-pages'