Merge pull request #12 from chadrien/master

Refactoring