Merge branch 'master' into shuntaro4
@2 amidakuji commit
Merge branch 'shuntaro4'