CS fixes
Merge pull request #69 from GrahamForks/cs

CS Fixes