Implemented reverse routing.
Merge branch 'feature-reverse-routing' into develop