Added issue #38