Merge pull request #6 from williecheong/master