Merge pull request #6 from wangzhaojiang/master

同步代码