Merge pull request #4 from williecheong/master

Merge pull request from williecheong/master