More Base URL updates
Merge pull request #2 from agautsc/master

More Base URL updates