Merge pull request #11 from lohuvie/master

xia
bug
Merge pull request #56 from lkjxa186/master

bug