Adding missing option in usage + litte improvement
Option added to enable the replay
Merge branch 'dev' into code-comment
Merge branch 'dev' into code-comment