Updated to vibe master