added base url to config
Merge branch 'master' into gh-pages