CS fixes
Merge pull request #40 from GrahamCampbell/cs

CS Fixes