CS fixes
Merge pull request #141 from GrahamForks/cs

CS Fixes