Added issue #32