Use new iteration methods with the events lib
Merge pull request #63 from amasad/master

[Bug Fix] Use new iteration methods with the events lib