Updated event handling a bit.
Updated assets
Merge remote-tracking branch 'origin/master' into release
Updated assets