CS fixes
Merge pull request #138 from GrahamCampbell/cs

CS Fixes