Added EventHandler tag - Fixes #153