Merge pull request #1 from AubG/master

Update from master