Routing improvements.
Routing improvements.
Merge pull request #10 from RBertram/dev

Dev