Handle multiple windows properly
Update version
Update build