Closes issue #5