closes issue #11