Added issue #37