CS fixes
Merge pull request #458 from peterkokot/patch-1

CS fixes