YOLO
Merge branch 'master' into devel. Add logos.