Merge pull request #3 from jtanguy/master

Refactoring