Merge pull request #1 from serge-sans-paille/master

updating