Merge pull request #269 from TheBlueMatt/2018-12-198-review