Fixing pom
Merge branch 'V02' into V03
Fixes and docs