CS fixes
Merge pull request #21 from GrahamCampbell/cs

CS fixes