CS fixes
Merge pull request #275 from GrahamCampbell/2.0-cs

CS Fixes