Improve setting locale
Fix tests
Merge pull request #1 from mirego/feature/improve-setting-locale

Improve setting locale