Merge pull request #1 from ebarboni/master

Apache Event integration