Merge pull request #274 from TheBlueMatt/2018-12-243-review