[CS] Just fixing some CS issues [#7]
Merge pull request #37 from stewe/fix-cs

[CS] Just fixing some CS issues [#7]