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

bug fix
bug fix