CS fixes
Merge pull request #81 from GrahamCampbell/cs

CS Fixes From StyleCI