update
Merge pull request #1 from iparanoid/master

update chendong