David Crow issue #26

this covers (does that work?) issue #26