closes issue #41