Merge pull request #75 from TheBlueMatt/2018-07-68-rebased