closed issue #15