Gunnarsson agrees new deal