Duplicate of previous commit, but with appropriate additions included.

Signed-off-by: THOMASDUBYAK <thomasdubyak@gmail.com>