close and open windows
Merge branch 'develop'