Added text-wrap at 80 chars.
Merge branch 'master' into windows