Brought main branch in line with gh-pages
Merge branch 'master' into gh-pages