before merge
commit after conflict resolved
translated another
translated another
revised
revised
revised
revised
revised
revised
revised
revised
revised
revised
Merge pull request #45 from soichi777/rules