issue #16 fixed