Attempt to work on subpaths
Merge branch 'master' into gh-pages
Update JS