Merge pull request #15 from walu/master

merge with walu
fix a bug
Merge pull request #49 from wenjun1055/master

fix a bug