CS fixes
Merge pull request #59 from GrahamCampbell/cs

CS Fixes