Merge pull request #1 from villagedefrance/master

Merge Master to Branch v1.6.1