增加稳定性- by jarrick
Merge remote-tracking branch 'origin/master'