Merge pull request #1 from BDrouilly/updates

Updates
Merge pull request #2 from BDrouilly/updates

ze
Merge origin/master into updates