Attempt to fix base URL problems.
Merge pull request #4 from marcevans/master

Attempt to fix base URL problems.