Issue #8 Solved