Issue #8 Implemented