CS Fixes
Merge pull request #5 from botrelli/cs_fixer

[CS] Coding Standard fixes