javadoc
Javadoc + opschoning
Merge remote-tracking branch 'origin/Derk'