Fixes for MSVC and some naming changes.
Merge pull request #56 from Fraser999/routing_v2

Fixes for MSVC and some naming changes.