commit before merge
merged 7230-2.1-4
translated
translated
revised
revised
Merge pull request #69 from soichi777/7230-2.1-6