Swap event dependency with window
Merge pull request #96 from bvssvni/master

Swap event dependency with window