Merge pull request #4 from GoldenDevs/ElyesBranch

Elyes branch