大幅に変更
Merge branch 'komaya1' into master1