Added issue #31