修正
Merge branch 'komaya'