[MC][issue #178] merge conflicts
Merge pull request #480 from MGhanem/Omar_C2S3_mod

[MC][issue #178] merge conflicts