Csm corrected
Merge pull request #2 from ckolbitsch/develop

Csm corrected