Javadocs
Javadocing
Update pom version in prep for merge with master