Merge pull request #10 from Nim0/master

Corrections bis.