Merge pull request #2 from dkuo7/master

PULL
curtis

my change
Merge pull request #8 from cthildebrant/master

curtis
Merge pull request #9 from rheck3/master

Merge pull request #3 from dkuo7/master
Merge pull request #4 from dkuo7/master