An improved integral model for plane and round turbulent buoyant jets