Fixed some errors I made.
Merge remote-tracking branch 'upstream/master'
Implemented Cancellable and updated packages for the events
Merge pull request #9 from TGRHavoc/master

Update