Closes issue #9