Fixes #47.

@sebmck Test cases also needed an update, this would result in another version bump.