Fixes issue #6
Fixes issue #5
Bumped the version