closes issue #15