Branch jens

@EmmanuelKasper would you be so kind to merge this branch?