Refactorisation
Merge pull request #73 from xavismeh/master

Refactorisation