Fix
Merge pull request #53 from infamousbutterly/master

Fix