Refactor i-api-request events
Merge pull request #108 from wtfil/delfrrr.refactor-i-api-request-events

Refactor i-api-request events