Closing issue #14