fadi commit
Merge https://github.com/regisjorda/CPS_630