Merge pull request #370 from TheBlueMatt/2019-07-369-fix-spaces