Updating docs
Merge branch 'master' into V03
Fixing api pom
Merge branch 'V03' into V04