Merge pull request #1 from laruence/master

merge with laruence
fix one bug

fix one bug
Merge pull request #32 from wenjun1055/master

fix one bug