Urls
Merge pull request #33 from varholl/friendly_url_fix

Urls
Merge pull request #34 from varholl/development

Friendly URLS Fix