Merge pull request #1 from ericzhang-cn/master

update code to newest