Merge pull request #3 from nucTroy/master

同步更新至最新
Merge pull request #4 from nucTroy/lizhijun20-master

Merge pull request #3 from nucTroy/master