Closes issue #29