adjusted line lengths to fit within smaller screens
Merge remote-tracking branch 'origin/master'