Merge pull request #38 from luzhitong/master

update from Jason