Closes issue #25