Merge pull request #482 from Maaack/fix-window-container-titles