Gervase Markham's entry.
fix merge conflicts