zhengang updatecode
Merge pull request #2 from joyplus/master

zhengang updatecode