Prevent double-firing of events
Merge pull request #37 from rdefreitas/patch-preventDoubleFiring

Prevent double-firing of events