Commit before pull.
Conflict fix.
Merge branch 'master' of https://github.com/czuczi/alhambra_szerver
Added clean up on window closing.
Conflict fix.