Optimisation
Merge branch 'routing' of https://github.com/kutagh/NetChange into routing
Fixed a nullref exception
Merge branch 'routing' of https://github.com/kutagh/NetChange into routing