Merged florian's javadoc