Closes issue #20