Merge pull request #67 from Lazersmoke/fix-Bens-code Fix Bens code