Closes issue #37