Csm corrected
Merge pull request #2 from ckolbitsch/develop

Csm corrected
revert csm to how they were before
Merge pull request #3 from ghisvail/develop

Develop