translated
revised
Merge pull request #147 from soichi777/7230-2.4-2