fix
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
进一步优化
Merge remote-tracking branch 'origin/master'
Merge pull request #34 from UlricGan/master

进一步优化