Urls
Merge pull request #33 from varholl/friendly_url_fix

Urls