cs fixes
Merge pull request #623 from cmfcmf/patch-2

cs fixes