Closing issue #130