FIX: Parsing events
Merge pull request #34 from Eric89GXL/minor-fix

FIX: Parsing events