fix issues #10
Merge pull request #11 from faceair/master

fix issues #10