Merge branch 'gh-pages'
browser check
Merge branch 'master' into gh-pages