Added issue #48