Merge pull request #83 from Fraser999/routing_v2

Routing v2