Closing issue #55