fixes for urls
Merge pull request #20 from yamnich/url-fixes

fixes for urls