closes issue #7