closes issue #18