Merge pull request #7 from williecheong/master