initial work
Merge branch 'master' into eventhandling
Refactored eventhandling. All events now execute in parallel.