condition check
fix a comment
Merge pull request #4 from hwchiu/master

Fix bug