Merge pull request #4 from wangzhaojiang/master

同步代码