closing issue #18