Updating zucchi.js from master