Close issue. Close #2