fix, null pointer exception
Merge pull request #6 from cheyiliu/master

fix, null pointer exception