Init plugin
Merge origin/master