Fix double events
Merge
Fix call remove console.logs
Merge pull request #153 from jerv13/master

Fix double events