updating route handling and uris
Merge pull request #6 from mrkrstphr/updating-routes

updating route handling and uris