Merge pull request #206 from simple-robot/dev/custom-event-type

Merge pull request #206 from simple-robot/dev/custom-event-type #450