bump version
bug fixes, added better tests