Merge pull request #1 from dho7/master

need to pull
Merge pull request #2 from Oxenchevy/master

n