Fixed CS
Merge pull request #84 from stof/cs_fixes

Fixed CS