Updated JavaDoc and README file