Merge pull request #118 from TheBlueMatt/2018-08-103-rebased

No match.