CS fixes
Merge pull request #178 from GrahamCampbell/fixes

CS fixes