Add descriptions
Merge remote-tracking branch 'code.makery.ch/master'