Closes issue #11