CS fixing
Merge pull request #100 from PUGX/cs_fixes

CS fixing