Improve routing.
Merge pull request #26 from dylanclement/better-routes

Improve routing.