Merge pull request #48 from wenjun1055/master

fix a bug
Merge pull request #15 from walu/master

merge with walu