Fixes #53 and fixes #54
Merge branch 'master' of https://github.com/Foggalong/hardcode-fixer