Set window modal and removed removeExistingWindow()
Merge pull request #312 from Junkern/issue#311

Set window modal and removed removeExistingWindow()