Closes issue #69