Routing improvements

Resolves
* Issue #5 
* Issue #6