CS fixes
Cs fix v2
Cs fix v3
Test fix
Merge pull request #33 from prisis/CsFixesPSR2

CS fixes