Fixes and closes issue #3