Fix description
Merge branch 'master' into zaalbar