fix filepath
Merge branch 'master' into gh-pages
make gh-pages consistent with master