Merge some variables and event handler code into master

[ZBoylan]

I'll just put the code in the master branch file. Avoid the merge conflicts