Merge pull request #5 from wangzhaojiang/master

同步代码