Merge nuest's and Moh-Yakoub's developments of the last weeks

I tried to merge all infor from Moh-Yakoub/master and nuest/master and it seemed to have gone well.