Improved diagramm
Javadoc, updated version