Merge pull request #57 from Fraser999/routing_v2

Fixed compiler errors for Clang.