closes issue #12