Fixed more route find bugs
Merge branch 'master' of https://github.com/keyaral/SwenProject
Fixed routefinding issues