CS fixes
Merge pull request #145 from GrahamCampbell/cs

CS Fixes