Issue #17 Solved