Merge pull request #8 from boucman/master

Handling of enums