Fixed line width
Merge branch 'master' into black