Solved Issue #1,#2