Closes issue #8