Feature/javadoc