気休めの設定
Merge branch 'master' into sanritz