Merge pull request #92 from Fraser999/routing_v2

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