Adding correct baseurl
Merge branch 'master' into with-blog