merge

maven fixes to release 1.0.2