70char/line condition fixed
Merge remote-tracking branch 'origin/master'