CS fixes
Merge pull request #3 from GrahamCampbell/cs

CS Fixes