The basic nature of the text remains the same but numerous modifications have been made to enhance its teachability. Photometry units and definitions are now consistent with the latest publications. A discussion of ideal fluid flow with Bernoulli's equation and the conservation of mass has been added.