update doc
merge code