Merge pull request #54 from Fraser999/routing_v2

Routing v2
Merge pull request #55 from Fraser999/routing_v2

A fix for MSVC warning and removed unwanted #include statement.