Csn Improvements
Merge pull request #374 from fgiannar/develop

Csn Improvements