Merge pull request #5 from cjakilix/feature/n4-refacto3

Feature/n4 refacto3