Correct main refactor
Merge pull request #2 from brissa-a/master-guillaume

Correct main refactor