pom.xml updated
merge master