closing issue #12