cs fixes
Merge pull request #281 from peterkokot/patch-cs

CS fixes