Added text wrapping and no list linebreak
Merge branch 'master' into development