Merge branch 'gh-pages'
invalid regex fix
Merge branch 'master' into gh-pages