Use relative instead of absolute paths
Merge branch 'master' into gh-pages
Recompile