Merge pull request #1 from yanhaijing/master

优化部分代码