CS fixes
Merge pull request #50 from GrahamCampbell/cs

CS Fixes