corrections by zmughal
Merge branch 'doco'