Added issue #44