Resolve #2, and close #2