Corrected/simplified the routing and language detection
Merge branch 'master' of https://github.com/DanOlivier/Home