Feature mitchell 3

See also https://github.com/siemens/codeface/pull/6. Reworked from review of the Mailing-List.