Minor change on condition for 70char/line
Merge remote-tracking branch 'origin/master'