Added issue #36