Merge pull request #264 from TheBlueMatt/2018-12-198-first-commit