Update doc and README with latest modifications