Implemented Issue #43