more modifs ameliorations
Merge pull request #3 from christou/master

more modifs ameliorations