Merge pull request #56 from JohnCny/master

merge
Merge pull request #86 from tanwh/master

Merge pull request #56 from JohnCny/master