first commit. Safe but maybe not completly refactor needed because my 2.0 image is deprecated.
Merge pull request #62 from JeanBaptisteArnaud/master

first commit. Safe but maybe not completely refactor needed because my 2....