Merge pull request #1 from mlippert/master

Work on event manager