Adds EventHandler - Fixes #5