Merge pull request #60 from adrifelt/master

Kill zombie windows