Email Record: A system for the generation and measurement of capillary-gravity waves /