Merge pull request #1 from jfsmig/master

Huge refactoring !