Merge pull request #16 from walu/master

merge with walu
fix a bug

fix a bug
Merge pull request #61 from wenjun1055/master

fix a bug