Closes issue #39