改进代码
Merge pull request #1 from liu21st/master

改进代码
Merge pull request #3 from baolimath/master

merge form Master