CS fixes
Merge pull request #38 from GrahamCampbell/cs

CS Fixes