CS fixes
Merge pull request #26 from GrahamCampbell/cs

CS Fixes