Closing issue #8