modifs
Merge pull request #11 from wulfy/branche1

modifs
conflict resolved