Closes issue #10