Improved the url handling
Merge branch 'master' of https://github.com/Daapii/pb_shovel