Fixed eventTimeout bug
Merge pull request #13 from cferdinandi/development

Fixed eventTimeout bug