translated
merged 7230-2.1-7
revised
Merge pull request #75 from soichi777/7230-2.1-8