More, more baseurl changes
Merge pull request #3 from agautsc/master

More, more baseurl changes