Merge pull request #27 from HeroesGrave/master

fix for un-feature-gated struct variants
fixed for enum namespacing change