Merge pull request #1 from kmean/master

更新
Merge pull request #7 from bchpan/master

Merge pull request #1 from kmean/master