refactoring
Merge pull request #2 from fduperier/master

refactoring