fix a couple of issues introduced, added test.
incremented version