Merge pull request #1 from sitle/dev

Factorisation