fix word-wrapping
Merge branch 'super'