Merge pull request #82 from Fraser999/routing_v2

Routing v2
Merge remote-tracking branch 'upstream/routing_v2' into routing_v2