issue127
Merge pull request #128 from xiechao06/issue127

issue127