Add Manuel Meurer's contribution.