Merge pull request #25 from danoli3/refactor-multiwindow

Refactor multi window with iOS working