Started work on EventBased scripting
Merge remote-tracking branch 'origin/master'