Add Better Close Window
Merge pull request #3192 from mreq/master

Add Better Close Window