Merge pull request #3 from mvaled/master

Adds i18n detection
Merge branch 'master' of git://github.com/Raynos/feature