Closing issue #97