Fixed Routing issues
Merge pull request #27 from albertodotcom/pranava

Fixed Routing issues