CS fixes
Merge pull request #2 from GrahamCampbell/fixes

CS Fixes Thank you very much!