Close #2
Merge and close #2