Clean pom.xml file

Relates (but far away) #283
Merge remote-tracking branch 'origin/master'