Closes issue #3