Revert "Merge pull request #145 from MGhanem/C3_SalmaFG_S07"

This reverts commit 62994a3dd5d035fa2e647df16f16f15919bbf321, reversing
changes made to 116c6995c89a97336007b882e10ffaf5f472bc71.
Merge pull request #156 from MGhanem/revert_master

Revert "Merge pull request #145 from MGhanem/C3_SalmaFG_S07"
Pulled master and fixed conflicts