Merge pull request #4 from nearmeng/master

6-21更新