implements Feature #220, refs Feature #218