調整
Merge remote-tracking branch 'origin/shigure242'
merge?