Merge pull request #11 from paulegan/master

Ensure urljoin doesn't ignore base path