Merge pull request #4 from nicolas-DH/master

last updates