modified routing
Merge pull request #19 from ataro24/develop

modified routing