CS fixes
Merge pull request #45 from GrahamCampbell/cs

CS Fixes