Merge pull request #21 from bcail/master

update url handling