fixes
Merge pull request #49 from WillSen/iss25

fixes