fixing various bugs and enum support
Merge pull request #7 in GFIG/main from enumsupport to master

* commit '739b75b8f5810bdd5f0609d46c2c19e46fa62e05':
  fixing various bugs and enum support