Closing issue #10