CS fixes
Merge pull request #158 from GrahamCampbell/cs

CS Fixes