Closes issue #36