A finite volume scheme with improved well modeling in subsurface flow simulation