some fixes
Merge branch 'master' of https://github.com/Matheus90/mobi-router