document inherited members
Merge branch 'master' into szn