Closes issue #22