Merge pull request #4 from Manhim/dev

Reworked on the router
Merge pull request #5 from Cervo/dev

Updating master for version 1.1.0