Merge pull request #67 from Lazersmoke/fix-andys-shit Fix andys shit