Updated pom.xml and plugin.yml
Merge remote-tracking branch 'origin/master'