Merge pull request #12 from sguha-cn/sguha-cn

bug fix
bug fix