CS fixes
Merge pull request #75 from GrahamCampbell/cs-fixes

CS Fixes