Merge pull request #27 from JohnCny/master

Merge pull request #39 from tanwh/master