Merge pull request #1 from tpoisot/master

modifs tim