Added issue #43