Fixed Event.ACTIVATE and Event.DEACTIVATE
Merge pull request #7 from israelazo/master

Fixed Event.ACTIVATE and Event.DEACTIVATE
Merge branch 'master' into dev