close issue #20