Merge pull request #1 from dkuo7/master

Robert's Merge
Merge pull request #3 from rheck3/master

Merge pull request #1 from dkuo7/master