close issue #25