An extension of the Lockhart-Martinelli theory of two phase pressure drop and holdup