Merge pull request #78 from TheBlueMatt/2018-07-43-rebased