Merge pull request #1 from AlexandrePavy/master

Update