Better handle urls provided by users. https://drupal.org/node/1874034
Merge pull request #4 from jbrauer/master

Better handle urls provided by users. https://drupal.org/node/1874034