Modify router to get it working properly
Merge pull request #20 from nickb1080/routerFix

Modify router to get it working properly