Fixed bug causing `eventTimeout` to always be null
Merge pull request #12 from cferdinandi/development

Fixed bug causing `eventTimeout` to always be null