Fixing #8; enhancing enumeration support; fixing name for action