closes issue #10
closes issue #10