readme update.
merged readme conflict.