(well, the merge was in the ruby file posted by Charlie)