Closes issue #2