Close window by sending message instead of close by itself
Merge branch 'develop'