Improvements by R. Worsley-Hunt.