CS fixes
Merge pull request #46 from GrahamCampbell/cs

CS Fixes