CS fixes
Merge pull request #44 from ShawnMcCool/cs

CS Fixes