Fixed issue with static classes with numbers

Inadvertently also resolved issues with static classes with underscores as
well. Thanks to @kris89 for giving me a head's up where to look. Closes #2