CS Fixes
Merge pull request #7 from botrelli/cs_fixer

[CS] Coding Standard fixes