Fix #1 - Firing handlers in emitter's scope
Merging master