[CS] We don't care about line length
Merge pull request #1 from adhearsion/develop

Merge upstream