Javadoc added, sorry!