Closes issue #4