Merge pull request #1 from dkuo7/master

curtis
Merge pull request #4 from cthildebrant/master

Merge pull request #1 from dkuo7/master