close issue #16