Updating cancel button
Merge remote-tracking branch 'upstream/master'
Adding data to COT
Merge pull request #5 from ripflame/master

Adding data to COT