Merge pull request #125 from TheBlueMatt/2018-08-114-rebase