Refactoring
Merge pull request #1 from ludovicriffault/master

Refactoring