Component/Routing simplifications
Merge pull request #65 from tiagojsag/component_routing_improvements

Component/Routing simplifications