Merge pull request #17 from boucman/master

Various fixes
Merge pull request #18 from boucman/master

various improvements to enum