add issue #25