Modif by Liviu
add credit
Liviu modif for Thierry repo
Proper credits
Merge between Thierry and Liviu
Merged Liviu