Merge pull request #14 from TheBlueMatt/2021-03-fix-enums