Merge pull request #2 from mlippert/eventmanager

Changed eventmanager to match the publish/subscribe pattern