Fix lang parameter being overriden by $locale. Fix #135
Fix custom names overriding
Merge pull request #144 from Toilal/lang-fix

Fix lang parameter being overriden by $locale. Fix #135