Merge pull request #1 from qchouleur/master

Update from master
Merge pull request #2 from Tamilan78/master

Merge pull request #1 from qchouleur/master