Closing issue #3