Merge pull request #219 from TheBlueMatt/2018-10-157-merge