Update eventmanager
Merge pull request #17 from zigbert/patch-2

Update eventmanager