Trad bubble.js
Merge origin/master