Merge pull request #2153 from nathanwilliams-ct/nathan/enum-static-type-checking

Static Type Checking: Enums