Closes issue #1