Traling whitespaces
Quit main loop when window is closed
Merge branch 'master' into bundle