xinhengs update
Merge pull request #1 from InMyWnd/master

xinhengs update