refactoring before modifiation of behavior
Merge branch 'master' of https://github.com/xebia-france/sim-service