Window fix
Window fix 2
Merge remote-tracking branch 'origin/CallebergBranch'