Merge pull request #2 from dkuo7/master

PULL
curtis

my change
Merge pull request #8 from cthildebrant/master

curtis