Closing issue #71