Fix for issue #3, regression test and version bump