Merge pull request #42 from nla/lookups

merged.
More enum lookups