fix bug
fix bug
Merge remote-tracking branch 'shiguodong/master'