Improving and unifying close() behavior
Merge remote-tracking branch 'origin/master'