completed issue #23 after discussion wiht Matt