Revert to old version
Fixes #10
Fixes #11
Fixes #12
Bump version