Merge pull request #26 from JohnCny/master

merge
Merge pull request #27 from JohnCny/master

merge
[modify]绩效一些bug修复
Merge pull request #84 from qkhj/master

modify