Final version with all javadoc included