Merge pull request #1 from 4ntoine/master

update