attempting to improve close()
Merge remote-tracking branch 'origin/master'