Closing issue #25