Changes made by David Gorst (lothcor@gmail.com).