Merge pull request #175 from TheBlueMatt/2018-09-173-whitespace-err