Refactor gentil
Merge branch 'master' of https://github.com/Canuta/Hibi.git