fixed bugs, updated tests
Updated version