Implemented Issue #4