Merge pull request #9 from walu/master

merge with walu
Merge pull request #10 from walu/master

merge with walu
fix blank space and chine one bug
Merge pull request #42 from wenjun1055/master

fix blank space and chine one bug