Added issue #39