Merge pull request #195 from dreamteam69/master

Add in more window event listeners