Merge pull request #15 from joverall22/master

routing