Pre-Add Issue #38

Added required code for issue #38, awaiting approval before activation.