Closes issue #30