Code Fix
Merge pull request #1 from ChristopherHunt/master

Code Fix