Adapted also the sample output from the doc