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

Swap event dependency with window