closes issue #13