update to allow longer lines;
Merge remote-tracking branch 'origin/dev' into dev