Rewrite, using URL Service.
Merge pull request #1 from sander1/master

Update to 2.1