Merge pull request #2 from gillestasse/master

refactoring