merge

maven pom.xml fixes to release 1.0.2