Closing issue #49