route changes
Merge pull request #71 from conorfennell/master

route changes