word refactoring
Merge branch 'dev' of https://github.com/argeset/set-locale into dev