Closes issue #42