Fix based on peer review & code improvement
Merge commit 'b9cc4048352d8de0fd9413d3ad5fc8dbca7347ef'

* commit 'b9cc4048352d8de0fd9413d3ad5fc8dbca7347ef':
Merge pull request #5 from jimmychu0807/master

Fix based on peer review & code improvement