Merge pull request #53 from CTFigueroa/master

Updated merge conflict
added new switch cases in events.js