Fix for Eclipse (pom.xml)
Merge remote-tracking branch 'origin/master'