merged 7230-2.1-8, 7230-2.1-9
resolving conflict
revised
revised
Merge pull request #80 from soichi777/7230-2.2-1