代码结构调整，修复神秘bug
Merge remote-tracking branch 'origin/master'