Refactoring.
Add libs.
Merge branch 'master' of https://github.com/romainguefveneu/naomaker