Merge pull request #49 from Fraser999/routing_v2

Some updates mainly to RoutingTable.