Closes issue #45