I've added some modifications Limit to 80 cols.

Description down here
Fixed merge conflict