Merge pull request #10 from HeroesGrave/master

Fix for num reform
fixed FromStr to use new namespace
Merge pull request #12 from tupshin/master

fixed FromStr to use new namespace
fixed enums for new namespacing rules