Added a @see reference to the javadoc
New class diagram
Merge remote-tracking branch 'origin/master'
Jonathan renamed this but both versions were still around.