Merge pull request #3 from dkuo7/master

Merger