Changes made by Per Larsen (lindsoe@gmllail.com).