Implement Issue #7