CS fixes
Merge pull request #2 from GrahamCampbell/cs

CS Fixes