Closes issue #15