Merge pull request #54 from jmonster/urls