trip js fixe - Finale Commit
Merge remote-tracking branch 'origin/master'