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

bug fix
changes