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