Actual changes for previous post (issues 16, 17 and 18 + Japanese language support). User git issues again.