Fixed some routing for current project
Merge branch 'master' of https://github.com/noahpc/WhiteCollar