Solved routing
Merge pull request #9 from delafuente/TAU-4_finish_routing

TAU-4 Solved routing