Changed some router functions
Merge branch 'master' of https://github.com/Remaged/Scadsy