Merge pull request #1 from MatthieuNICOLAS/master

Update from original