Refacto/uniformisation & correction
Include block inside only_if
Merge pull request #3 from BI-joe/refacto

Refacto/uniformisation & correction