Change the way to listen the 'add' event
Merge remote-tracking branch 'origin/master'