CS fixes
Merge pull request #30 from GrahamCampbell/cs

CS Fixes