Merge pull request #96 from rampo/master

2.1.2 in dev
Added Japanese values
Merge pull request #97 from cutmail/japanese

Added Japanese values
Merge pull request #98 from rampo/develop

Develop