Fix CS to respect PSRs
Merge pull request #2 from soyel/develop

Fix CS to respect PSRs