Fixed bugs, updated tests
Bump version number