Closes issue #19