Closing issue #4