Reworked on the router
Merge pull request #4 from Manhim/dev

Reworked on the router