Javadoc and README updated