using v4 of EventEmitter
Merge branch 'ee-v4'