doc and code update
merged