Merge pull request #414 from TheBlueMatt/2019-12-347-nits