Fixing maximum line length
Merge branch 'develop' into potentiometer