PR for issue #38