Implemented Issue #35