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