Changed
Merge pull request #2 from dwelch2344/master

My changes for the master repo