修复安全退出的bug
Merge remote-tracking branch 'origin/master'