Changes made by Martin McCarthy (martinmaccarthy@gmail.com).