設定の不備を修正
Merge branch 'master' into sanritz