Added support for multiple windows

See https://github.com/moredip/Frank/pull/250
Merge branch 'support-multiple-windows' of git://github.com/jberkel/Shelley into jberkel-support-multiple-windows