Updates routes
Merge branch 'master' into dev
Merge pull request #4 from jgoley/dev

Dev