Added issue #92