Added issue #25