Plugin : Corrected errors that appeared when Merging.

Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>
Merge branch 'WorkInProgressBranch'