Updated Tracker to be an EventEmitter
Merge remote-tracking branch 'origin'