Merge pull request #225 from TheBlueMatt/2018-10-214-redo