Solved Issue #9