Merge pull request #1 from hoosin/master

更新了一些文件
Merge pull request #3 from whidy/master

Merge pull request #1 from hoosin/master