Consolidate commit, intended to supersede #208 PR.
Merge pull request #346 from justcfx2u/master

Consolidate commit, intended to supersede #208 PR.