Update doc
Merge branch 'master' into supertab