refactoring
o
Merge pull request #5 from olivierrr/master

progress