a few new changes
Merge branch 'master' of https://github.com/chrisdavidmills/L20n-basic-example