Merge pull request #1 from gaodong/master

cc
Merge pull request #4 from Sampergao/master

Merge pull request #1 from gaodong/master