Closing issue #70