Merge pull request #1 from Surlavi/master

bug修正
fix bug
Merge remote-tracking branch 'shiguodong/master'
set question
修改bug
Merge remote-tracking branch 'upstream/master'