Fixes #7 and fixes #9
Merge branch '2.0' of https://github.com/emperorcow/shareenum into 2.0