Improved Friction Pressure Drop Correlation for Horizontal and Vertical Two-Phase Pipe Flow