Closes issue #18