修复一些bug
Merge pull request #68 from Zjazure/release-candidate

修复一些bug