Merge pull request #21 from tanwh/master

merge
Merge pull request #16 from JohnCny/master

Merge pull request #21 from tanwh/master