bug fix merge
Merge branch 'master' of https://github.com/EloiZ/Defi