Merge pull request #170 from TheBlueMatt/2018-09-119-rebased