Merge pull request #17 from MagicGroup/master

拉回来
修复编译错误
Merge pull request #56 from jiangtao9999/master

修复编译错误