cs fixes
Merge pull request #36 from fieg/cs-fixes

cs fixes