Closes #16
Merge pull request #21 from stianjensen/url-fix

Closes #16