closes issue #19