Merge pull request #1 from MatthieuNICOLAS/master

Update from original
Merge pull request #2 from score-team/master

Merge pull request #1 from MatthieuNICOLAS/master