closing issue #17