Resubmitting Enums pull request.
Merge pull request #88 from maxqchen/master

Resubmitting Enums pull request.