Closes issue #29 for now