Merge pull request #224 from TheBlueMatt/2018-10-221-whitespace