Merge branch 'master' into gh-pages
Baseurl should help the paths...
Merge branch 'gh-pages'