Merge pull request #70 from Fraser999/routing_v2

Routing v2