improve doc
fix conflict
Minor imrovment
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'ovya/master'