Merge pull request #309 from TheBlueMatt/2019-02-306-nits