Merge pull request #2 from jecnaLSD/master

Edit router for localhost and public server
Merge pull request #3 from jecnaLSD/short-url

Merge pull request #2 from jecnaLSD/master