closes issue #30