Updated support for multiple windows
Updated dialog boxes
Merge branch 'develop'