Also updated the text based upon suggestions from Havard.Eidnes.
Submitted by: Lars Fredriksen <fredriks@mcs.com>