Merge pull request #1 from dkuo7/master

Update
Merge pull request #5 from davidscz/master

Merge pull request #1 from dkuo7/master