bug fix
Merge pull request #38 from winstonho/master

bug fix