merged 7230-2.2-3
merged 7230-2.3.heading
pulled
resolving conflict
translated
translated
revised
revised
revised
revised
revised
revised
revised
Merge pull request #103 from soichi777/7230-2.3-2