Merge pull request #38 from luzhitong/master

update from Jason
Merge pull request #4 from JasonGuanGitHub/master

Merge pull request #38 from luzhitong/master