Second commit.With Plugin basic structure.
Merged master fixed conflict.