Closes issue #6