Soft wrap
Merge branch 'master' into laptop