Merge pull request #299 from TheBlueMatt/2019-01-262-redux