Merge pull request #6 from pthayer3/master

fixing my stuff
Merge pull request #7 from pthayer3/Testing

Merge pull request #6 from pthayer3/master