Merge pull request #7 from wangzhaojiang/master

同步代码