Merge pull request #226 from TheBlueMatt/2018-10-0.0.6