Merge pull request #6 from BurningPython/master

更新到最新代码
修复几个bug
Merge pull request #15 from julycw/mb

修复了几个bug