Merge pull request #2 from angelleng/master

zuishishang
Merge pull request #5 from beigerice/master

Merge pull request #2 from angelleng/master