CS fixes
Merge pull request #6 from GrahamCampbell/cs

CS Fixes