Merge pull request #296 from TheBlueMatt/2019-01-291-rebased