Merge pull request #145 from TheBlueMatt/2018-09-134-rebased