Added code to close #1