Closes issue #44