Solved Issue #8