Fixes and closes issue #2