CS fixes
Merge pull request #129 from GrahamCampbell/master

CS Fixes