Implemented Issue #13