close issue #16
closed issue #16