Preparando plugin
Merge origin/master