rebased
Merge remote-tracking branch 'snowsunny/master'
fixed zaikousei