Merge pull request #1327 from Fuzzysqurl/master

Maybe fix everything