Merging

Merging Samir into Master