Added issue #28