Fix for #6 and version bump