Added support for Enums
Fixes #2