Merge pull request #62 from wangxiao/master

待回归
修复bug