Solved Issue #5