Merge branch 'master' into gh-pages
update subpath for github pages
Merge branch 'master' into gh-pages